Merge changes from topic "tr-anim" into sc-dev am: 27008c11 am: 7993e317 am: c7ca077d

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

Change-Id: I8604e286a8e72626f2da493b0fcd23c54bff8230