Merge "Add cts for new VpnProfile fields" am: 6c0f75bf82 am: 363f60f141

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

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