[automerger skipped] Merge "Do not animate wallpaper when wakeAndUnlock" into qt-r1-dev am: e8f8d71ea4
am: 6d0f918225 -s ours
am skip reason: change_id I46574609a00712bdde5a4652ab5c9b0c04cbeeec with SHA1 c1d2041f15 is in history

Change-Id: I9218eada742fe85c5e6a9e166dd33eaa9c9a493c