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

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

Change-Id: Id0dbd9369bf933b7f77a188740f5ac14fcc7cfff