Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest."