Merge "Update shims for building an Ikev2VpnProfile from Builder" am: 49cdffc17f am: e0a228d51f

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

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