Merge "Fix text crossfade" into tm-dev am: 426c815c am: f30235db am: c8dfdbf6 am: 0fc74d37

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



Change-Id: I3c1c7e91ac570b62c6e2c1fbbaaa8911e746f348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>