DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master

Bug: 146167222
Change-Id: I742d85782246042b3686c646bd4c7878e7570acb
tree: 2f9d8ee3b3b1fc4a903208ee7483eb0c07c52227
  1. service/
  2. PREUPLOAD.cfg