[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 2a57937f96 -s ours am: 1aae6d66fc -s ours

am skip reason: Change-Id Id8ad6ce0b8f22cff73bff3c34f092021d99158bd with SHA-1 08590b8f33 is in history

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

Change-Id: If53ae98f3cf07a19a1c7cfdceaddbca671f816d3