Merge "Handle some Recents finish corner cases" into udc-dev am: d373da3c am: 25efc8a8

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



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