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

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

Change-Id: I49fb70c551d31eb9df564b895785784fdd1c37e6