Merge "Update UidCounterSetMap directly from NetworkStatsService" am: b68a9f0972 am: f4b74cd9aa am: 7f74a727d1 am: 8d7586a8f5

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

Change-Id: I9859228494613e234ed109068e0019a463edfe1a
tree: 45a0515cbbc37bdbb77fe9691ba655131cf08358
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/