Merge "Add list of Administrator UIDs to NetworkCapabilities."
am: 38812f345c

Change-Id: I7e5d0950ba99419d83fed6922a8f29aa530d4b00