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

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

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