[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 am: 063654a9 -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: I00762fbcfb616292c712a04c8b1722750b2a07be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>