Merge "Fix connect fail when bonding then connect" into main am: cc5c828b

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



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