[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 1fa5303a02 -s ours am: 865e8a18ef -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: If58daf4d4a5a40aae2526533b566b52cfc79d3e6
Signed-off-by: Automerger Merge Worker <[email protected]>