Merge "Floss: Fix volume set race for a2dp and hfp" am: 70058213 am:...

Merge "Floss: Fix volume set race for a2dp and hfp" am: 70058213 am: d3be908a am: e0f25fcb am: 5dc37152

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



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