Merge "Use int array for included and excluded uids" am: 2ccbfe9d8f am: 8b0350f4b6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018920

Change-Id: I73373faabcf62add0703854b3cf8fb35668b197d