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

Bug: 134405016
Change-Id: I01a5db1d6ac24a22a2728548556f0ba6c8cb8d21
tree: 1c5593fd0505a906f9be5316c773ab35be50adb9
  1. service/
  2. PREUPLOAD.cfg