[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 92b64349a3 -s ours am: 77bd081c99 -s ours am: 83f795b0b0 -s ours

am skip reason: Merged-In I085f90a064bfcf2ad9c9f98c8c38c93a32830a03 with SHA-1 ec4879ba87 is already in history

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

Change-Id: I0ad3d27911a5ddf74c0b754c9fba4a5c95f99032