GitLab

Merge commit 8b188b864302f5ea9df17636b378938a15b4605a was incomplete
because some conscrypt files have been moved into a separate repo.

There have been various changes in conscrypt which renders changes to:

crypto/src/main/java/org/conscrypt/OpenSSLServerSocketImpl.java
crypto/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
crypto/src/test/java/org/conscrypt/CipherSuiteTest.java

unnecessary.

This is effectively the same change as conscrypt
commit 8d7e23e1.

Change-Id: I0f8199f3bf39a035ad5453be6fea92f511dcf548