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

[automerger skipped] 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 am: 39092440 -s ours

am skip reason: subject contains skip directive

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



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