Merge "Floss: Fix lock deadlocks" am: d4446d87 am: 907f93df am: a472a480 am: 91a2643b

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



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