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

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



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