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

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

Change-Id: I3dd6a76c4c139d95e0141ca2da74e97dbcff9f8a