[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
am: d71c402dc3 -s ours
am skip reason: subject contains skip directive

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