Merge "Remove VpnType usage in VpnTransportInfo"