[automerger skipped] Merge Android 12 am: a1587adf5e -s ours am: 0e344af7b4 -s ours am: 43a5bbeb63 -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: I86752f113f98ce61995c4e56a48c39d3c6913197