Merge "Improve ellipsize performance" into rvc-dev am: b3b4990453 am: 9ca29d2c47

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

Change-Id: I435808ed8dc8fc6b67619b0e6aebb5b8f1889cc4