[automerger skipped] Merge "ImageDecoder: update AVIF checking criteria" into udc-dev am: 84c554c6 am: 24edaf03 -s ours

am skip reason: Merged-In Icef63c685206c39106e1630204b28ecd26fdca7b with SHA-1 f059c28c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22572878



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