Merge "gatt: Fix cancel connect" into main am: c779336a

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



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