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

Change-Id: I641f6df427ec3d2a02c63d70217053aa670ccb2c