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

[automerger skipped] Merge "Prevent media controls with no title" into udc-qpr-dev-plus-aosp am: cd8217eb -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/+/23339039



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