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

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

Change-Id: If4ff10a4793cee3a00aa1d66bf85af19f9e88b72