Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Update volume...

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Update volume control behavior" into tm-dev am: 0c05d9a9

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



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