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

Change-Id: If9b64dddcfafce5decf6b9de84481e2c1bc1dbab