WakeAndUnlock: Make sure to wait for screen turning on

Fixes an issue where instead of waiting for screen on
we start the unlock transition immediately when the screen
is already on. Instead, we have to wait for it to turn off
and then on again.

Change-Id: Ib1f66edc6ad2d3e71c4bf928b4b0e7531babf6e0
Fixes: 64080116
Test: Unlock via fingerprint a lot. Verify the status bar does not flicker.