[automerger skipped] Merge 24Q4 into AOSP main am: 31c3f04471 -s ours

am skip reason: Merged-In I1065c5443246d2da24e74e6bc3d4eaab30fd96dd with SHA-1 4392a191dc is already in history

Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/3413897

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