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

Change-Id: Ic580e0c51375e1f033e318db9b5c0fb56f451ec7