[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 6f203e49bd -s ours am: fa84a89060 -s ours

am skip reason: Merged-In I86752f113f98ce61995c4e56a48c39d3c6913197 with SHA-1 38b230900f is already in history

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

Change-Id: Idb4e52888145461bdcb3d9d52c6c60458b8cf852