[automerger skipped] Add three new IKE options in IkeSessionParamsUtils am:...

[automerger skipped] Add three new IKE options in IkeSessionParamsUtils am: f86af012 -s ours am: dc5ec471 -s ours

am skip reason: Merged-In Icadbe98b3df3cf3a80f51dc1467eb99753d82216 with SHA-1 332f7389 is already in history

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



Change-Id: I816143e38fb083f4b7b86e4505f85f0e8d6dd000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>