[automerger skipped] Merge Coral/Flame into AOSP master
am: 39a837aaf6 -s ours
am skip reason: change_id I690f858694942ea0ae231a4b4ee85976099f265f with SHA1 870516d342 is in history

Change-Id: I5b470ed86a9314cc9ba1d9e11f43f6415a3eb57b
tree: fb2fb063cee9e977f8f309c2560e2b10ea53b89b
  1. service/
  2. PREUPLOAD.cfg