Snap for 7550844 from 7b8865ceab76147c2a5b62d242b768dbc3d3466d to mainline-conscrypt-release

Change-Id: I580138e544d2b8d7ed8307003c6c12094545222d
tree: 0e3d372b36f4960d9a26fa32790ab9df8219f22e
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS