Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
am: 60409a9255

Change-Id: I19afe423ad9a4f0c9897dd82802e37412072e55c