Merge "Add unit test for NetworkStats iterator" am: ccdf2a5838 am: fe66f8f95c

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

Change-Id: I446885fcde3db21881dc2d3573867330359e3763