Merge "Use public APIs instead of Conscrypt ones" am: efe309e03d
am: a4e0d3bea1

Change-Id: I58650fb6ff72b6cc8129890dcc7a831d66a567fe