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

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

Change-Id: I7f58c7a096592576789e2cbcb56d940053d6222c