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

Change-Id: I06be01cd95d8619f942a9a1d8db1f52aa5691bdc
tree: 94be122d439d26bd0e46e6a7b7faf05e8a7c29b6
  1. service/
  2. PREUPLOAD.cfg