Merge "[Media] Add a MediaController.Callback that will disconnect us when...

Merge "[Media] Add a MediaController.Callback that will disconnect us when onSessionDestroyed is triggered." into tm-dev am: 254bb547 am: 81154b8c am: be45989f am: 8535df2f

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



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