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

[automerger skipped] Merge "Prevent media controls with no title" into udc-dev am: 910e30bf -s ours am: b2c75f7d -s ours

am skip reason: skipped by user ethibodeau

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



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