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