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

Tracks the revert of the corresponding conscrypt CL.

This reverts commit 7fdce769.

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: I5b8728575c4c02de10fff227ba40ec6ddc7ffa46