Merge "Add the IP version and encap type to IkeSessionParamsUtils." am: 325527e280

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

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