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

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

Change-Id: I2e01f96c1fb84b82ac9ffd383274bf069c2f5534