[automerger skipped] Merge "Merge Android 14 QPR3 to AOSP main" into main am: 72682c829f -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: I8295aaf884490c11be6e1ba4bb0d326062e834a4
Signed-off-by: Automerger Merge Worker <[email protected]>