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

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

Change-Id: I86f0a847655c251fbf27625633a3f7161db829fc