Merge "Improve ellipsize performance" into rvc-dev am: b3b49904 am: 9ca29d2c am: 8c2d85b6

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

Change-Id: I79ea4a0d7ba0a8360422c4f210b69baccbc7464d