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: 4813b5a6

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



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