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

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