Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main