[automerger skipped] Merge "Fix NPE of mAdvertiseCallbacksObj in JNI thread" am: e71a5f40 am: bfbb6e69 -s ours

am skip reason: Merged-In Ib1a616385b10586468bd511d66a8a6a13f350135 with SHA-1 8c72e6f0 is already in history

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



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