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

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



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