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

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



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