Merge "Improve ellipsize performance" into pi-dev am: bb487c32 am: 2a43ff54 am: c022be14 am: c0b6d57b am: b4e49d55 am: 365a14ad am: 3761f213 am: faacb95f

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

Change-Id: I6b0f37b088ed41704a06cd927b104753f759fc96