[automerger skipped] Merge "Cherrypick following three changes" into sc-v2-dev am: 02a12c7180 -s ours am: 16547fda47 -s ours

am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 cff127c5bc is already in history

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

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