[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 am: 4e62620c -s ours am: 67acafed -s ours am: 904bb7a1 -s ours

am skip reason: subject contains skip directive

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



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