[automerger skipped] Merge "Race condition handling when connection happens...

[automerger skipped] Merge "Race condition handling when connection happens after cancel" into tm-dev am: db85eae2 am: 5ed076bd -s ours am: d1b0a35b -s ours

am skip reason: Merged-In I7a57eadc6186746fc400742bf8c7adea8965e8de with SHA-1 1ab46ce1 is already in history

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



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