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

[automerger skipped] Merge "Prevent media controls with no title" into udc-d1-dev-plus-aosp am: 15b0fcf4 -s ours am: 664717f2 -s ours

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

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



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