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

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



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