[automerger skipped] [automerge] Fix the translation not work if the animation...

[automerger skipped] [automerge] Fix the translation not work if the animation is off 2p: 880a5921 am: fd025bac -s ours am: acef477b -s ours

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

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

Change-Id: Iada2ceff67ca2b2c0da22d2d4fe13ff6a2249fdd