DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to volume...

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

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



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