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

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

Change-Id: I7d084f653c30257c30e660dda4d5681cd8164a48