Revert "Merge pull request #13769 from timdream/lockscreen-unlock-transition"

This reverts commit 8b3338df8cb0144f2c2826b4b2d5c1841acdd038, reversing
changes made to 28e7dd59cf5b8ad9b197c59fbf92603e934e0474.