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: 80cf0172 am: 9d564936

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



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