Merge "Clean up handling of NetworkCapabilities#administratorUids." am: eb0b80c9e5 am: 2ea7a457b0 am: 5c96dc912b
Change-Id: Ib5491610873fd904a6e97f0f270a5b777ceaa4ba
This commit is contained in: