Merge "Merge "Fix NPE of mAdvertiseCallbacksObj in JNI thread" into tm-dev am:...

Merge "Merge "Fix NPE of mAdvertiseCallbacksObj in JNI thread" into tm-dev am: 56651713 am: de7372c7" into tm-d1-dev-plus-aosp am: 99215692

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



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