Merge "floss: Refactor lock usage for advertising in btclient" am: 6769e23f...

Merge "floss: Refactor lock usage for advertising in btclient" am: 6769e23f am: 0ef23027 am: ac670a48

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



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