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

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

Change-Id: Id586ed5f86e3789133518c5592c5629af826fcee