Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev
am: 46f2cdeb63

Change-Id: Ibdbeefd3c375504e935f938fe6e5008644ef7b66