[automerger skipped] Merge "Fix address consolidation when creating sockets"...

[automerger skipped] Merge "Fix address consolidation when creating sockets" into tm-qpr-dev am: f7974f3c -s ours am: bdf2d62e -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: I0a5793385b4a296f108eac93d374b0382f640623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>