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