[automerger skipped] Merge 24Q4 into AOSP main am: 962b0b6fc0 -s ours

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

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

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