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
Change-Id: I8d5fdef284168468c53454e998ccae98d15cbd16