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

Merge "Revert "Fix text crossfade"" into tm-dev am: 6be22611 am: eb3d2a32 am: 5718d802 am: 9765faa8

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



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