am c8c6b03a: am f794da7b: Merge "Fix wrong password attempt count in...
am c8c6b03a: am f794da7b: Merge "Fix wrong password attempt count in DevicePolicyManager" into jb-mr1-dev
* commit 'c8c6b03a':
Fix wrong password attempt count in DevicePolicyManager