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

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

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