Merge "VPN: Implement toString for VpnConfig." am: c874462c2d
am: 52f56a2948

Change-Id: Ic07276029d19ac42da901183d247fe79a25c139a