Merge "ConnectivityManager: improve argument validation"