[automerger skipped] Merge "BT: fix NPE issue in bt stack." into tm-qpr-dev...

[automerger skipped] Merge "BT: fix NPE issue in bt stack." into tm-qpr-dev am: b15a3ad3 am: 7abf46e0 -s ours

am skip reason: Merged-In Ie1fc9eb39ae2bc645f2ec96c7a0d7c369d40c02f with SHA-1 b535b251 is already in history

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



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