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

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



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