hg: jdk/sandbox: Merge

[patrick.concannon at oracle.com]

Changeset: 59f35a72df51
Author:    pconcannon
Date:      2020-04-08 10:47 +0100
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/59f35a72df51

Merge

! src/java.base/share/classes/java/net/DatagramSocket.java
! src/java.base/share/classes/java/net/NetMulticastSocket.java
! src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java