Merge "[Media] In MediaResumeListener, always disconnect the mediaBrowser when it changes." into tm-dev am: 9059ca67 am: c5018230 am: 83ccd350

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



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