[automerger skipped] Merge "Fix the translation not work if the animation is off" into sc-v2-dev am: b2866e9a26 -s ours
am skip reason: Merged-In Id0d02c422100effcf842209971052f4d6e9b0bd2 with SHA-1 880a59217d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17312465
Change-Id: I4af2ae9af2f1e7bbd0caf42df5401a4e408db2dc
This commit is contained in: