[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "translation_animation-sc-v2-dev" into sc-v2-dev-plus-aosp am: c9c3c523 -s ours am: c0de4576 -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: I8e0520fed7f3855c77920e29ab04a09331dda1b8