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

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

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