[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 3304abb0db -s ours

am skip reason: Merged-In Ic3ada788703313380061f5ca4f351f3d57cc8220 with SHA-1 4b95222aaa is already in history

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

Change-Id: I269342e35e625672e56a5b45a59acd4c7e23e84b