Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into...
Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb am: 21cd29e2" into oc-mr1-dev-plus-aosp
am: 62fe11f8
Change-Id: Ida4e0311b2d41f9dfaccd34a6bb19ec03f74e8ed