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

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



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