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

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



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