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

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



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