[automerger skipped] Fix address consolidation when creating sockets am:...

[automerger skipped] Fix address consolidation when creating sockets am: e13930c2 -s ours am: 714ce87f -s ours

am skip reason: Merged-In I66f6c8d783a06d88a370e1fe17df3c4704eae76a with SHA-1 05138246 is already in history

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



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