Merge "Merge "Partial revert of keyguard checks" into rvc-dev am: 2a3c62046c am: c9bd41438c am: 4a33c3e1f7" into rvc-qpr-dev-plus-aosp am: d5165f11a7

Change-Id: I51fac2841500b273faf27e3e3af36005dfdf1818