Merge "Apply crrev/c/5253448 to reduce flakiness" into main am: e82d81fe98

Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/2939886

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