Snap for 6838321 from edb138961b99401936b8342efb7dbaea3c354d62 to mainline-release

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