Merge "Fix rc connect fail after remove bond" am: 11c3f1f7 am: 2e11febd

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



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