Merge "Revert "Changed ConnectivityService#getServiceInstance so its a singleton.""