Merge "Key revocation check is permissive when device is unlocked"