[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 52d2149426 -s ours am: a3aa76becd -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: I72e8271d5b6cd56556ee09439f1c15af57a36d3c
Signed-off-by: Automerger Merge Worker <[email protected]>