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

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

Change-Id: I02b0574ed8efb365a47a81caac4d437c6ed1fd13