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

[automerger skipped] Merge "Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d am: 61d58dcf am: bfb7eecd" into rvc-qpr-dev-plus-aosp am: 44943c9e -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: I3ee092d22fb5f2f380bf59d3edeaddce5a437b79