am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is...
am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
* commit 'f8acd1d8':
Adapted the behavior when unlocking with fingerprint is not allowed