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

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