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: dee96197 am: af31e583

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



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