Merge "Race condition handling when connection happens after cancel" into...

Merge "Race condition handling when connection happens after cancel" into tm-dev am: db85eae2 am: 5ed076bd

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



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