[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: a783c127 -s ours am: 5beb77da -s ours am: d22c2779 -s ours am: 03a2dea8 -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: I1f395764141a41cf2abd6f404eefb46e6e18859d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>