Merge "Clean up handling of NetworkCapabilities#administratorUids."
tree: 5b931024fc30755cffdd02e70594b8218736cefd
  1. core/
  2. services/
  3. tests/