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

Bug: 120848293
Change-Id: I72eec4124bb614573b8ca6f7446ccaa36a0d2097
tree: 216f84d7b9713c2b922806c0ac1405f1cdb88188
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg