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

Change-Id: I05946cd931471942d5ca58dac6d03401a506ce78