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

am skip reason: Merged-In Icec0b50f6421770e15c40b0676b49b95b035c230 with SHA-1 06880a0d97 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/3258537

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