[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: c76d117d2a -s ours am: 33a31c83c7
am: 7060b90f6b -s ours
am skip reason: subject contains skip directive

Change-Id: If74795d76ee42ab2ec4383dc45ff311c6aef1d84
tree: 9a2455ede9b2bd6dc25158de56106c4bad54f0e9
  1. perf_tests/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags