Merge "Improve ellipsize performance" into qt-dev am: 819dc46a am: c5b814ec am: 6773d868

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

Change-Id: I2a931ddd9a044850a1cd5067a46691d211684a62