[automerger skipped] DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master am: 24bd99bc50 -s ours
am: 1cd191eace -s ours
am skip reason: subject contains skip directive

Change-Id: Ia469debf8953ce44140f6f4f38c943d5a90546e5
tree: 8b0eb0e74c1de209cfde6c1248e1d04d7c0cfa46
  1. service/
  2. PREUPLOAD.cfg