[automerger skipped] Merge "Fix an OOB bug in btm_create_conn_cancel_complete"...

[automerger skipped] Merge "Fix an OOB bug in btm_create_conn_cancel_complete" into tm-dev am: 0a903879 am: f7b75ba6 am: 8e33203f am: a0f0f1b3 -s ours

am skip reason: Merged-In I6cddf5189dbc34ce8346167ec04cb50c936898cf with SHA-1 5d323752 is already in history

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



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