[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: 5ff3f8fb -s ours am: 9e125075 -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/+/19454630



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