[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: faddc7cdc8  -s ours
am: 8cef6591c9  -s ours

Change-Id: I089d43355df988ed6e2b207a1b1625381fd0efc3
tree: b15c5c8082ee601b24b405db42d8037139280347
  1. java/
  2. tests/
  3. Android.bp