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

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

Change-Id: Ia1486957866ef76461718a679e956e7ee627cc7f