[automerger skipped] Merge "Fix connect GATT with IRK and public address" into...

[automerger skipped] Merge "Fix connect GATT with IRK and public address" into tm-dev am: b784e71e am: f117d966 -s ours am: 854f2ccc -s ours am: b995b671 -s ours

am skip reason: Merged-In Ib4d57b0a7a829a1603d62d5754120efbbbe11d56 with SHA-1 e287bc28 is already in history

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



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