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

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

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

Change-Id: If3d62d6fee31ebdb9a3325a246129b2b56c82660