Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d
am: 1d01ee0d97
Change-Id: I677703c99b318b0eec83e190a7713b90babbb56b
This commit is contained in: