Merge \\\"Always re-enable keyguard state when the user switches.\\\" into...
Merge \\\"Always re-enable keyguard state when the user switches.\\\" into nyc-dev am: 9e94c455 am: 6e5ff1cb
am: f716a049
Change-Id: I0fe6a3fe2e2002c9c89593390aa68348362eb62e