[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: 205c965c -s ours am: a5d6a294 -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: I89ed613dad4c83f694502b4f41a69df457826b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>