[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher]...

[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to volume icon when device is active am: dc6a2b91 am: 24c0a151 am: cf6e465a am: b35b33ff -s ours

am skip reason: subject contains skip directive

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



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