[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: daf44aea2f -s ours am: baee78d1f7 am: ef96cf345e
am: d59fa871d7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie39a49ecab31ac1f57c0de2e15490fde1c3719af
tree: b127630cb752a89d21e6ed34754d6ce523db5774
  1. service/
  2. PREUPLOAD.cfg