Merge "VolumeControlService: Fix for possible crash" am: 5ab7d8e3 am:...

Merge "VolumeControlService: Fix for possible crash" am: 5ab7d8e3 am: 48b575f6 am: 5cb88c21 am: 186d4691 am: 112fab26

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



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