Merge \"Merge \\\"Always re-enable keyguard state when the user switches.\\\"...
Merge \"Merge \\\"Always re-enable keyguard state when the user switches.\\\" into nyc-dev am: 9e94c455 am: ff0433c2\" into nyc-mr1-dev-plus-aosp
am: 1e197dd9
Change-Id: I45af1d69562c5b657e62c0824d16b986904ebcfa