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

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

Change-Id: I5f494b21457e78ef6c476182fc3b810f680e173e