Merge "Cherry-pick one upstream change" into tm-qpr-dev am: e0843e47c2 am: 4de23e181c am: 8a827e893b

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

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