Merge remote-tracking branch 'aosp/upstream-main' into aosp/master am: 0cab833d4d am: 46eabefe95

Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2499175

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