Merge "NotificationMediaManager is bad signal for resumption" into rvc-dev am: 59f73711b5

Change-Id: Ie5d882f7a891af3ce5ddf4138584403462e753df