[automerger skipped] Merge Android 14 am: 5c3d890abd -s ours am: d96a3d824e -s ours am: f21345055a -s ours

am skip reason: Merged-In I2087549f00883c6ce2a3d9833cff5fde547afaf1 with SHA-1 26e7ab7854 is already in history

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

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