[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: 9c8556d1 -s ours am: 52df2183 -s ours

am skip reason: subject contains skip directive

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



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