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

Bug: 120848293
Change-Id: I2dccf10bee413d2022e3e56f17043f2d80fee3e8
tree: 816d8c7ab29b0bb5b42e2bbe33120452614d9dd0
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS