[automerger skipped] Merge Android R am: 90010e16e5 -s ours

am skip reason: Change-Id I8bc0155abf6af90ce9f82e7d01647193e9442b55 with SHA-1 2506fb1492 is in history

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

Change-Id: I86d67046d7fc5ad6c4dc6988140af2b509391ed0