Merge "Fix a socket leak" into main am: 3f48f42cb9 am: b0f705240d

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

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