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

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

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



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