Merge "VolumeControlService: Fixes for CTS run" am: ef2bc3d4 am: 1691741e...

Merge "VolumeControlService: Fixes for CTS run" am: ef2bc3d4 am: 1691741e am: e7fb0568 am: fb520c07 am: 91c69e4d

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



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