[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 374fe4d7f5  -s ours

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