Merge "Partial revert of keyguard checks" into rvc-dev am: 2a3c62046c

Change-Id: I5c1b9337190aa3dfb867cac41e4ac1254bcdc15e