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

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

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