[automerge] Keep showing wallpaper when starting an app immediatly after...

[automerge] Keep showing wallpaper when starting an app immediatly after unlock. 2p: f0a9429c am: ef17fbb2 am: 33cf01cd

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

Change-Id: I5ae72f3143409614923f2ddfc64efe258e367746