[automerger skipped] DO NOT MERGE - Merge Android 13 am: cdd287a4bc -s ours am: 74e05bbf85 -s ours

am skip reason: Merged-In I46bf3f037d801f9fa1e724a102d3b3f4f71b6202 with SHA-1 e5744e22b7 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/image_io/+/2186755

Change-Id: Ie98a2b1caa3cb60f3c4ec4acc6e963b369e96e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>