Merge "Add list of Administrator UIDs to NetworkCapabilities." am: 452ccae317 am: 347f56c836

Change-Id: I1636f33bf5667442ee9a0b9d463e1ce4bcb2b737
tree: c3479f7c2ce25a4c8fb5fe53c87d16a48c340865
  1. core/
  2. services/
  3. tests/