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

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

Change-Id: Ida596807f937e9c0015c614a086fec2b4edeedd1