DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I68f702b5bbcae9b166fdc955d67bb9eb4502ef72
tree: 59b09c3ec7a34a33a547d64d7d3efe0ef041150d
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. proguard.flags
  5. res/
  6. src/
  7. tests/