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 am: a49d321a

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



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