Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev