Merge "Support change of several axes in textAnimator" into tm-qpr-dev am: 7b9b280fe9 am: 893e3d433f

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

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