Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to...

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to volume icon when device is active" into tm-dev am: 67382ffe am: a6866281 am: 9c8686e6

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



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