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

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



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