Merge "Revert the addition of IPsec/IKEv2/EAP bug component ID" am: 398ecb98f0 am: 13bd3b4290

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

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