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

Change-Id: Ie9ef6b6122bb7c5d6f429df781d5348dbe28b1bf
tree: 967410c4f561c46340244a956e3183fb015b2c2a
  1. service/
  2. PREUPLOAD.cfg