Merge "[automerger skipped] Prevent media controls with no title am:...

Merge "[automerger skipped] Prevent media controls with no title am: 8a7ab0e9 -s ours am: ea6f58ef -s ours" into udc-qpr-dev-plus-aosp am: 68a22fd5 -s ours

am skip reason: Merged-In I2db9edd269c2b62ee7de6714875fa098567510b6 with SHA-1 8a7ab0e9 is already in history

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



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