Merge "Move semaphore to osi scope only" am: b13bff5a am: 8db1b318 am: 5c1d2b61

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



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