Merge "Encode IkeSessionParams using getIkeOptions" into main am: ade571062f am: 06c8369cf7

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

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