tree f67785c61172038cc5ec96c9e9659bd51fb32994
parent cf45d9d932fe33c0489e05b2c1ab985f4cffce3c
parent f0d63ae530ebc512e437d0570b85c626bb881efa
author Robert Snoeberger <snoeberger@google.com> 1587150253 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587150253 +0000

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

Change-Id: Ie1b119bac1bc9b6b4a1e1e4550795bcc05875072