Merge "Remove Ikev2VpnProfile shims usage" into tm-dev am: e82be610bf

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

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