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

Change-Id: I77a36c8fb3975c7463d71057bc2a8736ae266be6