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

Change-Id: I80dc53174a8b9c7e010522c0688af78670c09c42