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

[automerger skipped] Merge "Fix address consolidation when creating sockets" into tm-qpr-dev am: f7974f3c am: f4ebed02 -s ours

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

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



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