[automerger skipped] [conflict] [conflict] Merge "Add placeholder when media...

[automerger skipped] [conflict] [conflict] Merge "Add placeholder when media control title is blank" into rvc-dev am: 98e02fa8 am: f97d449d am: f001eb5c am: 42390110 -s ours

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

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



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