[automerger skipped] Merge Android 12 am: a1587adf5e -s ours

am skip reason: Merged-In I02b12ffcfc0826054f0e446254e7fd0b47155975 with SHA-1 92b64349a3 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/libgav1/+/1847594

Change-Id: Ib5f9b91937910bd06b1532c09f1f449598db53d0