Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev am: cf3b6afe01
am: 4e5c3fbd99

Change-Id: I634fbc9cc6aac0f8aa9bee71cc2d19207efb7ec8