Merge "Use public APIs instead of Conscrypt ones" am: 1b9adbfdd1
am: dc310b7ccd

Change-Id: I47b34ef42370d33d9c7b361c30a6044bb3400941