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

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

Change-Id: I8ad0cee75449198f784585c5af0d2db83187231b