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

Change-Id: I24f9e05eaa32d8a3ba007a5785e6d48a86a2c9fe