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

Change-Id: Ia1011a790ab420b84c16867affaf7d1ce218f7f1