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

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



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