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

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



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