[automerger skipped] Merge changes from topic "translation_animation-sc-v2-dev" into sc-v2-dev-plus-aosp am: c9c3c5232a -s ours
am skip reason: Merged-In Id0d02c422100effcf842209971052f4d6e9b0bd2 with SHA-1 fe6fddb4f0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17312465
Change-Id: I136a9d7400a55795cb1e4475253b91f60de6f37f
This commit is contained in: