Bug 944601 - Use getCardLockRetryCount properly
Merge pull request #15588 from crh0716/944601

Bug 944601 - Use getCardLockRetryCount properly r=evelyn