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

Change-Id: I5a73c54af17efcde37354b20951bc47cb74a5747
tree: c6406784085f008190875a087e32e0b2cc93b8e4
  1. service/
  2. PREUPLOAD.cfg