DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master

Bug: 144955631
Merged-In: Iffdbf3da933887dfceac8e199edd1603d0b57ca1
Change-Id: I1e5c45826941609d6e0fd9962bb35b84182c30a0
tree: 54538fab1c079872ca82adbcf274e19fdf562be6
  1. service/
  2. PREUPLOAD.cfg