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: 2ab903ec

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



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