[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: 2ab903ec am: f65ea7bf am: 0183f3f4 -s ours

am skip reason: subject contains skip directive

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



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