[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 1d64e16b44 -s ours

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

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

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