[automerger skipped] Merge "Cherrypick following three changes" into rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am: ece04aac11 -s ours am: 36281cb07a -s ours

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

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

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