[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 52d2149426 -s ours

am skip reason: Merged-In I97fd4f2ffdfa2e5094b04e975ef4ce0ae9974dc2 with SHA-1 7c3a90dc60 is already in history

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

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