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

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



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