Merge "New NetworkAgentConfig API to replace NetworkInfo WiFi stuff."