Merge "Check that recoverySecretTypes contains TYPE_LOCKSCREEN during unlock."