Merge "Switch VpnDialogs from IConnectivityManager to IVpnManager."