Snap for 6993684 from bd07ddbecab2af9d6146baa3fa04577e250a9c39 to sc-release

Change-Id: I79e6d2d5cb6a9a1d1bcdd2c1c2fac71755011fc8
tree: dca1659251420b19796fb0202b66b28e819722b6
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml