Merge "Correctly count nri uid request counts" am: 5ab962df61 am: b039be7617

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

Change-Id: If4ff10a4793cee3a00aa1d66bf85af19f9e88b72
tree: d4a45fc764bcfb21a7da200bc47bd07abcd9c51e
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING