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

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

Change-Id: I9dacecdc1b38fd27add9ac68bfb9f7b5b16d3ff1