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