Merge "DO NOT MERGE - Merge ab/7272582" am: 8208049745 am: bf8d7e19c2

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

Change-Id: I1cac75f2310f7b242b34b6ed6470783a84974e8c