Merge "Change NetworkCapabilties administrator UIDs to be stored as int[]." am: 70a08d9f7e

Change-Id: I4f0c145c08a1e4fef7badcd6476d4a69808f15c1