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

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

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