Merge "Merge "Improve ellipsize performance" into rvc-dev am: b3b49904 am:...

Merge "Merge "Improve ellipsize performance" into rvc-dev am: b3b49904 am: 56e1621f am: 7de16fcf am: cc57204e" into sc-v2-dev-plus-aosp am: c28c5e56

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

Change-Id: Iab2ff9eecdf386ac4909d543544673abace45e9e