Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
am: d3878b5e12

Change-Id: Ibe7749ee616295426cdeae07deb9dc998c49e8e2