[automerger skipped] Merge "Update NetworkCapabilities administrator UIDs to be int[]." am: 668619a32d -s ours

am skip reason: Change-Id Ifb807df34851d39cf996a3a0a96cb50c8ca14771 with SHA-1 e2887be39f is in history

Change-Id: I80f53cc5f43d7a4b2485510cb701d2c242aa20c0
tree: 20c5fb930740333ad55904baf9211db258c41607
  1. service/
  2. PREUPLOAD.cfg