DO NOT MERGE - Merge ab/7272582 am: 4aa8865ab5

Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/1736021

Change-Id: I10a8bc092d5ccea060947c9a9c55ab2c4846909e