Merge "VpnDialogs: use IConnectivityManager instead or ConnectivityManager."