[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 0d3a8d4c90 -s ours

am skip reason: Change-Id Ib7af1dc437feb7676e2c9ebe81075bc9e93f0eb9 with SHA-1 6f0afa2b61 is in history

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

Change-Id: I860ce5de2e18470bef7e0f378a467ce02a0ab171