Snap for 8558685 from 3c8ac109ea4c81d06e502832a6cc61b900c38c57 to tm-frc-conscrypt-release

Change-Id: I9371110cd8d8432171355ab1031a121dc0531d15
tree: 892b34dc4b0830c5cfc7e3e4cfe65865bcbb0494
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS