Merge "Modify textAnimator to support strokeWidth Change fontInterpolator to use adaptive step when change and cache typeface for different weights" into tm-qpr-dev am: efa77dd8 am: cc5ed450 am: 26188382 am: 58c30a65

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



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