Snap for 7132927 from 822cc4ac0b805cf4ad753a096ebff06d94fa47b7 to mainline-conscrypt-release

Change-Id: I8f6941674c727e0d15ddd92c85969fe5fa66b277
tree: 3493cacfcedb79561144a2f3613436fbfaee5234
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS