Merge "Replace ConnectivityManager.isNetworkTypeMobile usage in NSS"