[automerger skipped] Merge "gatt: Fix crash in gatt" into tm-qpr-dev am:...

[automerger skipped] Merge "gatt: Fix crash in gatt" into tm-qpr-dev am: a088c772 -s ours am: 61fcf386 -s ours

am skip reason: Merged-In I3bc96253b852e86d439f1189fbc971e8ca47c5b2 with SHA-1 f6e6a9a8 is already in history

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



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