Snap for 6657497 from 3185839a0fe2d07970ce213bc1c6369836572fba to mainline-release

Change-Id: I861d1a63b6c8fd92f4eeccbad966753716050fef
tree: b62c1cc1ef9030e7d77c00877ab5583ec5115bf5
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg