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

Change-Id: Ibadb8f4808060e3d25fc93da5593abfcf819191b