Merge "Keep the RetryIndex if the Error is IKE Protocol Exception" into main am: 14b5cc157e am: 762c024c74 am: 6cc6a43608 am: bf7b73539c

Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2751970

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