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

Change-Id: Ica26cfc21702834a71021a5c0f993df38705abf1