Snap for 11689785 from ea0dba30b1337aacf0879bd7d743470863c9b31b to mainline-conscrypt-release

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