Merge "Remove VpnProfileStore dependency from CSTest" into main am: d02c00867e am: d0570cea7d

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

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