Merge "Fix ellipsis reinitialization for static cached StaticLayout." into sc-dev am: dba0fb55 am: 8b6286ee

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

Change-Id: I89c31bbc9178d159783918e81d3a4b5f5f1a780e