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: d8fe49ec

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



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