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

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

Change-Id: If3d62d6fee31ebdb9a3325a246129b2b56c82660