Merge "Support encoding/decoding IkeSessionParams with IKE_OPTION_INITIAL_CONTACT"