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

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

Change-Id: Id3aacb04666802940a244f3544aac6237e5a46cc