Merge "Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: 93b97bd6 am: 3f0d6c7e" into rvc-d1-dev-plus-aosp