Snap for 7550844 from 5e37d6a42e16d9312cee791aba436ef031fec1e2 to mainline-conscrypt-release

Change-Id: I3e1155ae5fa0c2baecf4599b1b7f10d39a2e4658
tree: aca057c986eff64ba4d2a1a04130e3542d534c59
  1. res/
  2. Android.bp
  3. AndroidManifest.xml
  4. CleanSpec.mk
  5. OWNERS