[automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0daae -s ours am: 41378ed286 -s ours am: afd2af6f87 -s ours

am skip reason: skipped by user nona

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

Change-Id: I4c0e19d061aaa0ce9a6a6edc6ec81f88c6bbf41d