Merge "VolumeControl: Fix volume for the activated device" am: 3cc5e479 am:...

Merge "VolumeControl: Fix volume for the activated device" am: 3cc5e479 am: fa71b61d am: 303ad38f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2229630



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