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

Change-Id: Iaae116d001c3fbeebd908345c1283d46efc41ce3