[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 71713f0abb  -s ours
am: d9f905caeb  -s ours

Change-Id: I124819fae9bbbafca6c66630561e0f61517de870
tree: 7d964c368b9ed60ecab79517f7838a62a4289ee4
  1. java/
  2. tests/
  3. Android.bp
  4. build.gradle