Merge "Support NetworkStatsEventLogger" into main