Merge "[Media] In MediaResumeListener, always disconnect the mediaBrowser when...

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

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



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