Merge "Disconnect also connecting Bluetooth device" am: 88585ad5 am: 77861ece

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



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