[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: 99ac6352 -s ours

am skip reason: subject contains skip directive

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



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