[automerger skipped] Merge Android R am: 82bb089456 -s ours

am skip reason: Change-Id I00a0930452a689304126c64ce8dd6ed837ff9b74 with SHA-1 f4d6e000d6 is in history

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

Change-Id: I9e4cc4d988f0f431bd365fafdbc0a7ba417ed3fe