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