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

Change-Id: I8263373c8f5211915165c14a396baf33566c0c7a