Merge "Revert "Revert "Expose correct FileDescriptor in DatagramSocketAdaptor"""