Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""