Merge "Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev am: cf3b6afe am: 4e5c3fbd" into oc-mr1-dev-plus-aosp