Merge "DO NOT MERGE: provide different change in downstream since merge conflict [Output Switcher] Enable volume control for single cast device" into sc-v2-dev am: 69778829

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

Change-Id: Ic44a9a3225d2a6521076ba485b882fe15603863c