Merge "Disable the remaining VPN CTS tests on watches." into main am: c8a42f6a39 am: 1032b1c039 am: 16e3938098

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

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