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

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

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