[automerger skipped] Merge "Clean up handling of...
[automerger skipped] Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev am: 221d383f -s ours
am skip reason: Change-Id Id630fe9d76aacdaf038fdaa5360f0327520ee0c3 with SHA-1 89849636 is in history
Change-Id: Ic3e78575a0b50cfd6ca8e309461214ba4c72b818