Merge "Remove Ikev2VpnProfileShim" into tm-dev am: d0ba85bd03

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/18707785

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