Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into...
Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev am: cf3b6afe am: 49825540
am: 31eed4f3
Change-Id: Idd8a04a660f2258c502b6f57b0e70dcf947fc873