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

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

Change-Id: I18b2d124a974541b693bcd8f96c8f2b46bb01052