Fix semantic merge conflict between session serde and foreign encodings#7362

robert3005 merged 1 commit intodevelopvortex-data/vortex:developfrom

rk/fmtvortex-data/vortex:rk/fmtCopy head branch name to clipboard