Merge "VpnDialogs: migrate to VpnConfig."