[automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0da -s ours

am skip reason: skipped by user nona

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909231

Change-Id: Ie41a7f83f27194050fca526b5ac62e94c559c5ac