[automerger skipped] Merge "ActivityView animations!" into rvc-dev am:...

[automerger skipped] Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d am: 56fbd2cb -s ours am: 6618668f -s ours

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

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

Change-Id: Ic8b68a473c5995c4ce50ede0b32248b923c685ff