Merge "Fix flicker when task move to back" into sc-v2-dev am: d2f034f1d5

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

Change-Id: I1e0f846612b97975ac1e9313f7bd4dbd632f48d4