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

Change-Id: I14ede22a6d4b77858fcc49f1e410e6249c7608e5