[automerger skipped] [automerge] DO NOT MERGE - Cherry-pick two upstream changes 2p: 470a3e6a1e am: 676c1dfb70 -s ours

am skip reason: subject contains skip directive

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

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