Merge "Fix switch task flicker from reveal animation." into sc-dev am: 383d6d318a

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

Change-Id: I7dd69de3708eedbe451f977065a6c6e24e64b8bf