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

Change-Id: I38c77f4b375cf73963cfd349ec811de4c5519584