Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main am: 99c8a5d1e2 am: 38cd577ed9 am: 7f5b1b15fb

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

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