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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019627

Change-Id: Ic9432694c0cfe8adce586fe627c4a25055f884d3