Merge "Add an explicit media indicator icon to SysUI media controls" into tm-qpr-dev am: 4fd565a8ae am: 77b48638fa

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

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