[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
am: 83d13cf105  -s ours

Change-Id: I9ebe0bb6da776c6b6ea264a322221303314d15bd
tree: eab4813ac84b43f0a1cecfe1fc8a185b42cab7c2
  1. service/
  2. PREUPLOAD.cfg