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: 026f956c am: 83aa235d

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



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