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

Change-Id: Ie45222c8aab74d0591250c42ab8aa16e66305be7