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

Merge "Revert "Fix text crossfade"" into tm-dev am: 6be22611 am: f09a7f24 am: 141d6910 am: 705ecf1c

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



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