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 am: 082277f3 am: 3c31bdfb

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



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