Merge "Merge "Improve ellipsize performance" into pi-dev am: bb487c32 am:...

Merge "Merge "Improve ellipsize performance" into pi-dev am: bb487c32 am: 2a43ff54 am: c022be14 am: c0b6d57b am: d28382ab am: f66b6836 am: d8703133" into sc-v2-dev-plus-aosp am: 3841d791

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

Change-Id: I6db259be56f77b856995e15aaade2539cbb3f0c6