Merge "Correctly count nri uid request counts" am: 1b7a5e282c

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

Change-Id: I5ab86516030c8758b77c7335da68fd4f01b34a60