Merge "Keep showing wallpaper when starting an app immediatly after unlock." into sc-v2-dev am: efcf2e85 am: ef310224 am: 60c042aa

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

Change-Id: I1989bc06db1720ea9a3118bd8d22ffb5030efa89