Merge "Revert "Fix text crossfade"" into tm-dev am: 6be22611

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



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