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