Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Bug: 135460123
Change-Id: I7fae8980be7053236188c10a9379bf8fe5914ab2
Merged-In: Icd8b079a9c119fdd02ba79ae0feb19ebedd7f8db
tree: 66489d2e1bffb5661ef2b8daf15e679dca8d7983
  1. service/
  2. PREUPLOAD.cfg