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