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

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

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