Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" into rvc-dev am: 4cf6815168

Change-Id: Id8a008d174a11f2d9caf1443307999c7cc862777