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

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

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