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

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

Change-Id: I19cdbe2dfa6d9b50b3e80df28fca8a448b78b2e8