[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 15377d67cd -s ours
am: 9b62be6a04 -s ours
am skip reason: change_id Icd8b079a9c119fdd02ba79ae0feb19ebedd7f8db with SHA1 daf44aea2f is in history

Change-Id: I851491cdbdbda63314d2dd15032d4866d73c3efd
tree: 41b7ee69d7fd1daf24556572cb003d2f7a6c76a1
  1. service/
  2. PREUPLOAD.cfg