Merge "Deflake doTestPlatformVpnWithException related tests" into main am: 52f3e8f29e am: 66917f7d0b

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

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