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

[automerger skipped] Merge "Prevent media controls with no title" into udc-qpr-dev am: ce526345 -s ours am: 4319763e -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/+/23338457



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