[automerger skipped] Merge "Merge Android 12" am: 8af90b30e9 -s ours am: 92c754a73a -s ours am: 24461b4d1e -s ours am: fe18eeb759 -s ours am: e6d900d0ad -s ours

am skip reason: Merged-In Ic89735da5a174e41b72c6bdd45e9d09509d0702e with SHA-1 3304abb0db is already in history

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

Change-Id: I7fa254fcae6b9c339644f370ed738d28bb182740