[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: f4d6e000d6 -s ours am: c6159665ab -s ours

am skip reason: Change-Id I2fd77533987528dafbbcd5e01c9b44a424f70ddf with SHA-1 7646625c85 is in history

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

Change-Id: I0af55151cbec94b9ac4c466486f0d59dbda0c65e