Merge "Consolidate _check_public_network_connectivity into NetworkScenarioTest"