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

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



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