Merge "Remove Ikev2VpnProfile related shims usage" into main am: 0509e0da16 am: 1f47e6f2e6

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

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