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

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

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