Merge "Fix cannot unlock keyguard when work challege is unified and work mode...
Merge "Fix cannot unlock keyguard when work challege is unified and work mode is off" into nyc-dev am: a4c0b1de
am: 29e2e8ca
* commit '29e2e8ca':
Fix cannot unlock keyguard when work challege is unified and work mode is off
Change-Id: Ie3c29865e8f3fdd5acffec72c3b309ce11f7b767