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

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

Change-Id: I3dd6a76c4c139d95e0141ca2da74e97dbcff9f8a