Merge "Fix split-tasks & wallpaper flicker when unlocking keyguard" into...

Merge "Fix split-tasks & wallpaper flicker when unlocking keyguard" into udc-dev am: 235c3fa7 am: bd9a0824

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



Change-Id: I255722a8b1a24f4dd9f2f34acf79bde03e1d73a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>