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

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

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