[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 -s ours am: 65e7349f -s ours

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

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



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