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

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

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

Change-Id: I4e4674499f59c88c44c4eedbd83a3d5b7fb6717b