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

Merge "Merge "Fix split-tasks & wallpaper flicker when unlocking keyguard" into udc-dev am: 235c3fa7 am: dee96197 am: af31e583" into udc-qpr-dev-plus-aosp am: fd12eb11

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



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