[automerger skipped] Merge "Merge Android R" am: 5ad2f87792 -s ours am: c711e9eb88 -s ours am: ffad11701d -s ours

am skip reason: Change-Id I908ebc0537b77bd31f31e259d3edf20647a5e7bb with SHA-1 2a57937f96 is in history

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

Change-Id: If686afc89dc60add6810e47eb87b036a98d3a734