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

Bug: 120848293
Change-Id: I2d1d683dc7d8188993b4734f169df70fa4b82677
tree: b7d6bad84d8338e7c021084b169445adafa960ec
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. proto/
  5. res/
  6. src/