Merge "Add VpnDialogs for user space VPN."