aml_con_341511080 (11429545,com.google.android.conscrypt,com.google.android.go.conscrypt)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26110884', 'googleplex-android-review.googlesource.com/26137234'] into sparse-11388687-L84500030001923667.
SPARSE_CHANGE: I42b87d1c536d48b3ded43d81527bc4fbd26fbd98
SPARSE_CHANGE: I7737c74fefb8fb468bd123c31838e1264f85dacd

Change-Id: Id4b4f0fd24f17b1e252145b9e823d3ba15201f75