[automerger skipped] Merge 24Q3 to AOSP main am: d3cfb16399 -s ours

am skip reason: Merged-In I77d9c4ee152ba6554226a04e5a07abb95f4645ea with SHA-1 69f5d8443a is already in history

Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/3258237

Change-Id: Ia03499d4377536e50a9731672ae1e7374e516cb6
Signed-off-by: Automerger Merge Worker <[email protected]>