[automerger skipped] Merge "Merge Android 13 QPR2" am: 6d669f96f2 -s ours am: dcc3925b11 -s ours am: 3082fe7c41 -s ours

am skip reason: Merged-In I2b60b477495b444fa64722a9a78586839f25c3d9 with SHA-1 b56d29a0a6 is already in history

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

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