[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: c0e41846aa -s ours

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

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

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