[automerger skipped] Merge "Add placeholder when media control title is blank"...

[automerger skipped] Merge "Add placeholder when media control title is blank" into tm-dev am: dfc4955c am: b8096072 -s ours am: 58154a80 -s ours am: 1c78986b -s ours am: a8c577e7 -s ours am: f5188a0e -s ours am: 7cd37d68 -s ours

am skip reason: Merged-In Ie406c180af48653595e8e222a15b4dda27de2e0e with SHA-1 965e5146 is already in history

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



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