[automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am:...

[automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0da -s ours am: 41378ed2 -s ours am: afd2af6f -s ours am: 5cf0bcff -s ours am: 72a39d44 -s ours am: 9a70036b -s ours am: 6540d0c6 -s ours am: cb19bb71 -s ours

am skip reason: skipped by user nona

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

Change-Id: I12a550a9b9858bd50552abd052b8c1c3765c2ba8