Merge "Improve ellipsize performance" into qt-dev am: 819dc46ad3 am: c5b814ec0a am: 6773d86838

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

Change-Id: Iba8e76af067c32f2f04a2888dd6c9691ec94bab5