[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: a446d90800 -s ours

am skip reason: Merged-In I221a9c64159e6b0456a3c9ffeead7422e4e1ce38 with SHA-1 4bdef2719e is already in history

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

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