Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev
tree: 4a170cceb191513856b8043fca3f2d70667394cd
  1. core/
  2. services/
  3. tests/