Merge "Test recoverable Ikev2 errors" am: 281390e58c am: af4edb7ad7

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

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