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

Change-Id: Iaeb6ce3bf806a53aa731daf92c326d58a2cc7465
tree: 66489d2e1bffb5661ef2b8daf15e679dca8d7983
  1. service/
  2. PREUPLOAD.cfg