[automerger skipped] Use proper resolved address upon connection fail or...

[automerger skipped] Use proper resolved address upon connection fail or timeout am: 6006867c -s ours

am skip reason: Merged-In I5086ad669df914cfbe3f2a0f7c5e3100c6aaee7a with SHA-1 6dd8bbf5 is already in history

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



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