DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master

Bug: 151763422
Change-Id: I67ff905b64f6e4d7e201514f56bb6e0423faf455
tree: 00949aee2193acd0eb8914a2517dfb0f322eae9c
  1. service/
  2. PREUPLOAD.cfg