Merge "Revert "Detect an activity "replacement" transition and animate...

Merge "Revert "Detect an activity "replacement" transition and animate accordingly"" into udc-qpr-dev am: 0ce7829b am: d2dbf406

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



Change-Id: I9ce005b6fbe09d214e15cc61daa2b875e6d1f47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>