[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
am: ac01b8191f -s ours
am skip reason: subject contains skip directive

Change-Id: I3661c4a7df90e810a28a28c7a38cc73c54cc23be
tree: f0be4f5ea71906fbd347ed8aabab7b249b4d5e98
  1. service/
  2. PREUPLOAD.cfg