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

[automerger skipped] Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d am: 61d58dcf am: 89562167 am: a5636bd5 -s ours

am skip reason: Change-Id I0b01dab4bb0c82873afc55d054bafc672bacc8bf with SHA-1 750ba7b3 is in history

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

Change-Id: Ia403b5cddfb31e7014bb63947ce72631ac807e70