Merge "Fix connect GATT with IRK and public address" into tm-dev am: b784e71e am: f117d966

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



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