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

Change-Id: I469aecf3227e26e34ba75f70c23a59f54e8619cf