DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master

Bug: 132622481
Change-Id: I13d6e99d2a65357ec84815d4ac6aa33cdac0be95
tree: 7e66ba9775a01f370412a90ae59f463383f2a61f
  1. service/
  2. PREUPLOAD.cfg