Merge "Merge "[Media] Add some tests in ResumeMediaBrowserTest to ensure we're disconnecting old browsers." into tm-dev am: 5630265c am: 429a11db" into tm-d1-dev-plus-aosp am: 8db7ebb5 am: 84787a73

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



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