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: I9c647a7f43bb7523696637cab5a20b5e72b115cb