Merge cherrypicks of ['googleplex-android-review.googlesource.com/23077069'] into tm-qpr3-release. am: 908e171393

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

Change-Id: I8407905b9764975868c17bea0bc695e956339040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>