[automerger skipped] Merge QQ3A.200605.002 into master am: 901e602221 -s ours am: b44da56f63 -s ours am: 7646625c85 -s ours am: 430cc09e41 -s ours

am skip reason: Change-Id Ib517ffb5d866fb61e9c97f25dd1a3de84a5d98bd with SHA-1 10593ce709 is in history

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

Change-Id: I6cb8529ff98af28ff27791eca44ddd253c31ba67