Merge "[Output Swithcer] Fix volume control issue for Group" into tm-d1-dev am: 4fffb051d5

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

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