Merge "Move NetworkStatsUtilsTest to Connectivity" into main