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

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

Change-Id: Ibec1f37f2062827cf390eb344dd30447bdabec13
tree: 86bbb29a2c4744e6cf7ebfd9f2427124c9825c26
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING