[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 44d218718d
am: 549a9d5abb -s ours
am skip reason: subject contains skip directive

Change-Id: I02271557b58e8e88bf2efa733d851bcd70cf49f5
tree: 78e33fd23bfd46b15942f2494ddc2e3340021ecd
  1. service/
  2. PREUPLOAD.cfg