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: 247b6c8b

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



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