Merge "[Media] In MediaResumeListener, always disconnect the mediaBrowser when it changes." into tm-dev am: 9059ca67 am: 12997c24 am: 3f356e5b am: b4c4d6a1

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



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