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

Change-Id: Iafc8de444be0c455a8b6e3e51c3b6b407fd125e5