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

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

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



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