Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" into rvc-dev am: 4cf68151 am: da7b5b0b Change-Id: Ibfbed881ae08f69f15ee3d2fa3c251b4ef5fb68a