Merge "Merge "[Media] Add some tests in ResumeMediaBrowserTest to ensure we're...

Merge "Merge "[Media] Add some tests in ResumeMediaBrowserTest to ensure we're disconnecting old browsers." into tm-dev am: 5630265c am: 37b47793 am: 2e3a252f" into tm-qpr-dev-plus-aosp am: 431a9edb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144865



Change-Id: Ia7ab5c1d62c1c542b4422c4afac34d32cc38b41f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>