[automerger skipped] Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev am: 221d383f am: 87d73dd7 am: c3d38a93 -s ours am: a15763bb -s ours

am skip reason: Change-Id Id630fe9d76aacdaf038fdaa5360f0327520ee0c3 with SHA-1 919385b5 is in history

Change-Id: I17221e3955d566c8b0a844d33697b3b8bbde51cf