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

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



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