Merge "Support encoding/decoding IkeSessionParams with IKE_OPTION_INITIAL_CONTACT" am: 839597dea5 am: b816eaa304

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1868646

Change-Id: Id248ed1b2389b9bdeda7aea9ebff59307366c65a