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

Change-Id: Ia0d3473950b7da0d8b635aec74c0500ac12b59ac