DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: If8dde93e499fb008fed948a1a3f08add5565667f
tree: 0dfa0a31392d4cab076628e0d0283002da9a8fe5
  1. service/
  2. PREUPLOAD.cfg