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

Change-Id: I4965f2d46000f92929f63da1f9e4d697c0155207