Merge "Merge commit '602e2e8979d111b02c959470da5322797dd96a19' into aosp/main" into main am: b469e8f789

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

Change-Id: I521b49f0c60299465a8032fe31ddc265b50e6636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>