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

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

Change-Id: Ibb6b5b032cfa06b1c6c0e6527396c93c2fb05f21