Merge "VPN: move VpnDialogs related methods into VpnConfig."