Merge "Use proper resolved address upon connection fail or timeout" into tm-dev am: 73e014e0

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



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