Merge "Merge "Fix Pair-to-Pair animation being canceled in recents transition...

Merge "Merge "Fix Pair-to-Pair animation being canceled in recents transition handler." into udc-dev am: 0d295f9d" into udc-dev-plus-aosp am: f7de3551

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



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