[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: ac01b8191f -s ours am: 18bc9d0d61
am: 8ae5cddaec

Change-Id: I8f1bb94d2777b9cabad95dc2b68a596e21f5705a
tree: f9064ef436d51e612d626daca2ae658336be8f3d
  1. service/
  2. PREUPLOAD.cfg