Merge "Improve ellipsize performance" into pi-dev am: bb487c3233

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

Change-Id: Iff5983577266bd350db57121fdcf5b3ab8f1f51b