[automerger skipped] Merge "Fix the translation not work if the animation is...

[automerger skipped] Merge "Fix the translation not work if the animation is off" into sc-v2-dev am: b2866e9a -s ours am: 294a30e4 -s ours am: 54ed3e4a -s ours am: 1b226db8 -s ours

am skip reason: Merged-In Id0d02c422100effcf842209971052f4d6e9b0bd2 with SHA-1 880a5921 is already in history

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

Change-Id: I6be3e15eed3835d5b94d5d7ff8a79e80af28545c