Merge "Add unit test for NetworkStats iterator" am: ccdf2a5838 am: 0225ef74d6

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

Change-Id: I1f857065b22776eeeb7f3a6c3315dc466aa6b444