[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 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: I250942b33d1f20386df1b40c27e78c30cb8e9750