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: a4881d91

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



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