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" into oc-mr1-dev
am: ad825bdf
Change-Id: I38873a197f94af5013cf8fdd8ad014969bae14f8