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

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

Change-Id: I5af4e772a85d856a0e8fcaa38be32ae781ad4cc7