Merge "Fix flash when canceling the recents animation with a screenshot" into...

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

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

Change-Id: I822354e58e47b2a8d34c478519c46e01b6924720