Merge "Remove Ikev2VpnProfile shims usage" am: 8cc7a49a1e

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

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