Merge "Improve ellipsize performance" into pi-dev am: bb487c32 am:...

Merge "Improve ellipsize performance" into pi-dev am: bb487c32 am: 2a43ff54 am: c022be14 am: c0b6d57b am: d28382ab am: f66b6836

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

Change-Id: I1d57c9e58e9de66e15f51910368a8a438275869e