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

Change-Id: I1636f33bf5667442ee9a0b9d463e1ce4bcb2b737