[automerger skipped] Merge "Use DPM's counter for invalid password attempts" into pi-dev am: 375e397b09
am: 832d40e084  -s ours

Change-Id: If2b703e1f76282bf161e463761bce32cb779ac47