[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: c5b15a34c7 -s ours

am skip reason: Change-Id I1325e88711b3e467279ebcc168ddb20525b0388a with SHA-1 0d3a8d4c90 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7afeb8c96d64d34852c8b978df38ae5b1dd27b1