Merge "Fix connect GATT with IRK and public address" am: 76619597 am: e4dcb258

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



Change-Id: I573cbcd33c428c63b6f1d9040a2467d19328d651
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>