[automerger skipped] Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d48 am: 56fbd2cb6d -s ours

am skip reason: Change-Id I0b01dab4bb0c82873afc55d054bafc672bacc8bf with SHA-1 06785ab656 is in history

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

Change-Id: If14960b763ca88e6fc5e3c65f7ec33a39b02b576