Merge "Use proper resolved address upon connection fail or timeout" am: f283c738

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



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