[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 568fee9721 -s ours

am skip reason: Merged-In I11b907ab99ab722aa8436d1d23188e07851654ed with SHA-1 1c0be20d05 is already in history

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

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