Merge "[Output Switcher] Improve volume control" into udc-qpr-dev am: bc8c625b

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



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