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: b4e49d55 am: 365a14ad am: 9b007989" into sc-v2-dev-plus-aosp am: 3808b919

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

Change-Id: Iaa3ce3e0256c72f934e3424627cc5d9ecdeea798