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

Bug: 134405016
Change-Id: I4a7833ba6a0a2ca074600aa444ff167879454a47
tree: 16a58d3e6aa425878bf3c0d43c0423df117dfe4f
  1. service/
  2. PREUPLOAD.cfg