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

am skip reason: Merged-In I8761f768a273230ed58389233b7118cb11e04980 with SHA-1 e282bd8cbf is already in history

Original change: https://android-review.googlesource.com/c/platform/external/pigweed/+/3257962

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