Merge "Cherry-pick crrev/c/5233108" into main am: 64599586d3

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

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