Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set"