This reverts commit 25bef03cbf8d24c225b97202423dae75ed8b640f. Breaks build with cannot access com.android.org.conscrypt.SSLClientSessionCache class file for com.android.org.conscrypt.SSLClientSessionCache not found Change-Id: I6a89b45d5e8c7547778d7485ed02006cd4679989