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

Change-Id: Ie1b119bac1bc9b6b4a1e1e4550795bcc05875072