Merge "Cherry-pick one upstream patch" into qt-dev am: f6d5488d84 am: 443f1c6551 am: 51a405ee86 am: 8f15d5b751 am: 56fd87744e

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

Change-Id: I8837cd0ebed1e09e11821fd446669183dcc0bd73