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

Change-Id: I38dfcc1318dd484b2298df2355b8ac0d0c464fb2
tree: fb4b2bfdd39efb7b275118e745fe5ac838a94d9a
  1. service/
  2. PREUPLOAD.cfg