[automerger skipped] gatt: Fix crash in gatt am: ab002fc8 -s ours am: a6c91d52 -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: I521986a969d02276a7f322ef6da3e002f53783c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>