[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: b005cebd8d
am: 518d95dffe -s ours
am skip reason: subject contains skip directive

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