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

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

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



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