hg: jdk/sandbox: Merge

[michael.x.mcmahon at oracle.com]

Changeset: 00696d49723f
Author:    michaelm
Date:      2020-04-21 15:05 +0100
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/00696d49723f

Merge

! src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
! src/java.base/share/classes/java/nio/channels/SocketChannel.java
! src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
! src/java.base/share/classes/sun/nio/ch/InetServerSocketChannelImpl.java
! src/java.base/share/classes/sun/nio/ch/InetSocketChannelImpl.java
! src/java.base/share/classes/sun/nio/ch/Net.java
! src/java.base/share/classes/sun/nio/ch/SelectorProviderImpl.java
! src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
! src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
! src/java.base/unix/classes/sun/nio/ch/InheritedChannel.java