Merge "GD: set advertiser id in_use in the lock" am: 64dc9fd9 am: 1335ce7e...

Merge "GD: set advertiser id in_use in the lock" am: 64dc9fd9 am: 1335ce7e am: 952b563a am: cde63a10

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



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