aml_con_341410300
Snap for 8564071 from 1a5d6d4997847e0ec2040be5cb9a7efaf1620e72 to mainline-conscrypt-release

Change-Id: Iaa7e30895c034caa96a5641f0666abf74853d2c2
tree: 617cf534ca4fbd4c103f76136f54ac51571b31e8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. proguard.flags