Merge "NotificationPlayer: fix race conditions" into oc-mr1-dev
am: 20e1c66a78

Change-Id: Iba4e88e036b564c8ccbd615beb9ec7b608e7230e