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

Change-Id: I90c62de34372b534b6110489ab9c720e1419f985
tree: 59591b2fb602343390a7a675abb418240adaad73
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags