Merge "Improve ellipsize performance" into rvc-dev am: b3b49904 am: 9ca29d2c am: 8c2d85b6 am: 2293e541

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

Change-Id: Ibe38c7389cd4d0b95f05201ce8afc8fb2d66bf7b