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

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

Change-Id: Ib3787d51dcb62bffc22264313ff1e068a161f105