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

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

Change-Id: I649ea11cb08cba9fdeaac61179626e19337b0078