Merge "Add the IP version and encap type to IkeSessionParamsUtils."