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

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

Change-Id: I4c60412503edec9d4a75867efd71355797b31f1d