Snap for 9412736 from 5bd7db43b4907846b3a5a559b97f2b5db41e9fd7 to mainline-conscrypt-release

Change-Id: Ibc4f9cf698b6d321fc3c37f162c63976a7ce70c2
tree: 588579d20c1145adf6a59f18c4f58b9076cdb314
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS