[automerger skipped] Prevent media controls with no title am: 8a7ab0e9 -s...

[automerger skipped] Prevent media controls with no title am: 8a7ab0e9 -s ours am: ea6f58ef -s ours

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

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



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