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

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

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