[automerger skipped] DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master
am: 24bd99bc50 -s ours
am skip reason: change_id Iffdbf3da933887dfceac8e199edd1603d0b57ca1 with SHA1 decfc41e11 is in history

Change-Id: I074424ce60d45a5fe7bdbf3e17c1c3014449bb0b
tree: b2a48875209285ce2b6c0aaf30bf42371e756faf
  1. service/
  2. PREUPLOAD.cfg