Merge "Fix TestNetworkAgentWrapper flakiness"