[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: daf44aea2f -s ours
am: baee78d1f7

Change-Id: I66010a8ecf43de005727598bca044770cf1fb39b
tree: 66489d2e1bffb5661ef2b8daf15e679dca8d7983
  1. service/
  2. PREUPLOAD.cfg