DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master

Bug: 151763422
Change-Id: I61d3f512a6f97f814ceb30a3e1b7e9fea265ff97
tree: 768fcc8f35e9f0aca842eb5e261e0671558b7f02
  1. service/
  2. PREUPLOAD.cfg