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

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

Change-Id: Ibec1f37f2062827cf390eb344dd30447bdabec13