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

[automerger skipped] Merge "Use proper resolved address upon connection fail or timeout" into tm-dev am: 73e014e0 -s ours am: 17ca4f3f -s ours

am skip reason: Merged-In I5086ad669df914cfbe3f2a0f7c5e3100c6aaee7a with SHA-1 6006867c is already in history

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



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