Merge "Improve ellipsize performance" into rvc-dev am: b3b49904 am: 56e1621f am: 7de16fcf am: 93fee1b2

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

Change-Id: I5b3931f557f6ee23ff5d83346115e36699633dcb