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

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

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