Merge "Add underlying networks into NetworkAgentInfo if any"