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

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

Change-Id: Iaaff4ee707c3d74c3191adbe5103d06c950e0a6c