Merge "Update test for new IkeTunnelConnectionParams field" am: 5850372963 am: 3bc464a68d am: ba0473ed73

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976972

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