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

Bug: 120848293
Change-Id: Icb8e9f9f89b3af9f4ec18c992eac48dbaa42271b
tree: 77b44f573be30ad71558da74fe9ce7a5de9b53c7
  1. java/
  2. tests/
  3. Android.bp
  4. build.gradle
  5. OWNERS