Small updates to Android-changed code in javax.net.ssl

Add Android change markers.

In SNIServerName.java, SSLContext.java, and SSLEngine.java, revert
diffs from upstream that are cosmetic or otherwise unnecessary.

Bug: 38192317
Test: make core-oj
Change-Id: Iefaec4f8e70511b474cc8277c50edde0d465846e
5 files changed