[automerger skipped] Merge "Test recoverable Ikev2 errors" into tm-qpr-dev am: a7958e8784 -s ours am: c0708b46ff -s ours

am skip reason: Merged-In I5e881c6b42aeb98adce598587e2a7e49be7d9643 with SHA-1 adb56e94a5 is already in history

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

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