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

Change-Id: I11ddc51a8c71d22b5420def8a4c0f3f57954a081