[conflict] [conflict] Merge "Add placeholder when media control title is...

[conflict] [conflict] Merge "Add placeholder when media control title is blank" into rvc-dev am: 98e02fa8 am: f97d449d

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



Change-Id: I79635bb40b66edbe898afe856e2aa375da166e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: Ie406c180af48653595e8e222a15b4dda27de2e0e
Merged-In: I1cb6010f19623bd7d5e5bbb5d829b9e4936894b8