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

Change-Id: Ie4c87596874df7ea4a9c0bb00bd36e3022f61ad9