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

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



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