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

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

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