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

Merge "Detect an activity "replacement" transition and animate accordingly" into udc-qpr-dev am: 30298d32 am: cf7bc172

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



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