[automerger skipped] Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" am: ea11eb2a am: c62583fb -s ours am: 82f983a3 -s ours am: fa26916d -s ours
am skip reason: Change-Id I3f8dd1d232e2b18dae9e99eb05c92a797a2358b9 with SHA-1 c8922177 is in history

Change-Id: Ic03faed95413229bf84ae44353be4170880e583d