Fix janky in transition doze -> lockscreen

Also fix some unnecessary layer creation for dismiss button.

Bug: 18238168
Change-Id: I71989f2a24162e4453781c07e50d6c25fb380089
2 files changed