Merge "[automerger skipped] Merge "Fix memory leak of MediaControlPanel" into...

Merge "[automerger skipped] Merge "Fix memory leak of MediaControlPanel" into udc-dev am: 2f0a41a1 am: 54378aa4 -s ours am: c9803614 -s ours" into udc-qpr-dev-plus-aosp am: 8c20b6ef -s ours

am skip reason: Merged-In Idb1f3a750e6e87c56c645f53ce678a62e7181f11 with SHA-1 d560fba3 is already in history

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



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