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

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

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