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

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

Change-Id: Ic8da78fdfe5a6c3acae50b809c6adcf36f4994e2