Merge "Fix null reference used for synchronization" am: bd190fb0 am:...

Merge "Fix null reference used for synchronization" am: bd190fb0 am: d28319a7 am: 60ecaaac am: 5442aae7 am: 0203ad43

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



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