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

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



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