[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: ad70c1ab -s ours

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

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



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