DO NOT MERGE - Merge ab/7272582

Bug: 190855093
Change-Id: I8288e7c5e7e039aa26c3288927cfcb60b931a35a
tree: 88cb62b184bcb46ab61254aca85e445312ca4699
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS