Merge "Cherry-pick one upstream patch" into qt-dev am: f6d5488d84

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

Change-Id: Ic60b1a978d4fc7ebee12550dea617e784a558c31