Merge "Test UidCounterSetMap in NetworkStatsServiceTest" am: dd26c5709e am: 8123e528e7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961303

Change-Id: If4d2e280dd980eb401cb93968e1b1d9616bd0ac8