Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded." into mnc-dev