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

Bug: 120848293
Change-Id: I8b1d0cd8c9a2b9e8a0a368b49b5c401912f881db
tree: d526598327697d7fc283e943e1e8df53b77e504b
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS