Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.

Tracking the revert of the corresponding Conscrypt CL.

This reverts commit 51c55971.

This is a clean revert. The upload hook to fix lint errors was not run
(this CL was uploaded with --no-verify).

Test: Treehugger
Test: make droid cts
Bug: 62424503

Change-Id: I72ae3e1b1264fc0c3d04cf188867eea603f5b691