Merge "Fix text crossfade" into tm-dev am: 426c815c am: 987d8f4e am: 7e399616

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



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