[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 am: f001eb5c

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



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