Merge "Use DPM's counter for invalid password attempts" into pi-dev
am: 375e397b09

Change-Id: I675d053d3250ad91adb3999ba10bba7110190ac2