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: fc90f32f am: 132a9ded

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



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