Merge "Clean up handling of NetworkCapabilities#administratorUids." am: 7ac175925c am: d30159678b am: c82bde604a
Change-Id: Ib5491610873fd904a6e97f0f270a5b777ceaa4ba
This commit is contained in: