Merge "Fix a couple more issues with canceling the recents animation w/...

Merge "Fix a couple more issues with canceling the recents animation w/ screenshots" into sc-dev am: 00d2556f am: 584679da am: eb636b82

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

Change-Id: I1f07d25cb5ef071544dd22221c173e087f09b75c