Merge "Close the socket fd in case of an exception during setupSocket method to avoid socket leak." into main am: 24289ea9b3

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

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