DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Icd8b079a9c119fdd02ba79ae0feb19ebedd7f8db
tree: 16a58d3e6aa425878bf3c0d43c0423df117dfe4f
  1. service/
  2. PREUPLOAD.cfg