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

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

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