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: I1501c454fb452dff01aa07a221d6929b283cd62e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>