Merge "Always call finished when merging with an ongoing recents transition"...

Merge "Always call finished when merging with an ongoing recents transition" into udc-dev am: 1c9c183a am: edecbdfb

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



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