Merge "[CLATJ#29] Remove the throwaway sockets for dup2 fds" am: 171db11c5f am: 455dfb8022

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

Change-Id: I32f39a1537b66d2f0113bf50d62f67b4d4367a30