[automerger skipped] Merge "Add placeholder when media control title is blank"...

[automerger skipped] Merge "Add placeholder when media control title is blank" into sc-v2-dev am: 7a18989c -s ours am: 642fc490 -s ours

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

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



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