Merge remote-tracking branch 'aosp/upstream-staging' into merge_to_main_netty am: 09524263b7

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

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