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