hg: jdk/sandbox: Merge

[michael.x.mcmahon at oracle.com]

Changeset: e7f3eabb041e
Author:    michaelm
Date:      2020-04-24 18:03 +0100
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/e7f3eabb041e

Merge

! src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
! src/java.base/share/classes/java/nio/channels/SocketChannel.java
! test/jdk/java/nio/channels/ProtocolFamilies.java