Merge "Revert "Add three new IKE options in IkeSessionParamsUtils"" am:...

Merge "Revert "Add three new IKE options in IkeSessionParamsUtils"" am: c271a2da am: 9c20b1ed am: 92ac8f2a am: 3f7609bf am: 6817cb01

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



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