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

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



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