DO NOT MERGE - Merge ab/7272582 am: 3fb418dd58

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

Change-Id: Ie61d3888343b9d77a7b481c215cfe1f54bc2c101