Merge "Keep showing wallpaper when starting an app immediatly after unlock."...

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

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

Change-Id: I878ea6dc69e0b474aebb364fc0a6cb936152f7a2