Merge "Make assertNetworkStatsEquals supports null iface name" into main