am 3bf26f1d: am 5be4d295: Merge "Only enable fingerprint auth after first...
am 3bf26f1d: am 5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev
* commit '3bf26f1d':
Only enable fingerprint auth after first regular auth