Merge "Fix flash when canceling the recents animation with a screenshot" into sc-dev am: 1da53a25

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

Change-Id: If072f3efffa2e7a66fff1695cb7f589ee9560230