Merge "Test UidCounterSetMap in NetworkStatsServiceTest" am: dd26c5709e am: 852cc7891e am: 528e58c4b3

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

Change-Id: I491b793ea920b1d3f390c41b4c9b04a61eb97972