[automerger skipped] Merge "[DO NOT MERGE] Add placeholder when media control...

[automerger skipped] Merge "[DO NOT MERGE] Add placeholder when media control title is blank" into tm-qpr-dev am: 6e265c08 -s ours am: 0665ff26 -s ours am: a34a9ada -s ours am: 94c71a35 -s ours

am skip reason: subject contains skip directive

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



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