Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
am: 2e7b65f74a

Change-Id: I20ab95a2a6b677ac04cd46dbf89775f1cd8f071c