Merge "Fix address consolidation when creating sockets" into tm-qpr-dev am: f7974f3c

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



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