[automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0daae -s ours am: 41378ed286 -s ours
am skip reason: skipped by user nona Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909231 Change-Id: I4718eb293f114399a708b4fb4a71274567a7f4f5
This commit is contained in: