[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 7d75806407 -s ours am: 3711e5d64e -s ours

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

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

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