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

[automerger skipped] Merge "Fix memory leak of MediaControlPanel" into udc-dev am: 2f0a41a1 am: 54378aa4 -s ours am: c9803614 -s ours am: 3bc94142 -s ours

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

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



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