[automerger skipped] Merge "Fix an OOB Write bug in gatt_check_write_long_terminate" into tm-dev am: 0494f1ab am: a1e3164e am: de4f0f9b -s ours

am skip reason: Merged-In Ifffa2c7f679c4ef72dbdb6b1f3378ca506680084 with SHA-1 d4e34d86 is already in history

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



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