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

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

Change-Id: I12477322cd89aa9cce63d00c67fedce7a51afcd7