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

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

Change-Id: Ic04c11357b662bab5ac34dfcb1c311d6cc4a1479