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

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

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