[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: d71c402dc3 -s ours am: 6f8afd1326 -s ours
am: 226b6334e8

Change-Id: Ibdd6214a4d3d3427c16e5076bb7d80143b6c0b93
tree: 379d10573421fb8808b23cfe38f8de8fcd401caf
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg