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

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