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

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

Change-Id: Ib199fcaa758bd8f80a12d56345b36511a53cea89