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 am: 5b3c30c8

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



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