Reland Cronet 121_0_6167_71: Merge remote-tracking branch 'aosp/upstream-staging' into main

Revert submission 3031237-revert_v3

Reason for revert: Fixed in aosp/3036676

Reverted changes: /q/submissionid:3031237-revert_v3

Change-Id: I256d356c90ba71a1cba4fa2b492be060021a4c15
4143 files changed