Merge "Media output selector chip color updated per designers" into tm-dev am:...

Merge "Media output selector chip color updated per designers" into tm-dev am: 058f1d9e am: bcc8cc75

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



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