am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev

* commit '3767d85caac8eec6c7c219de3d0a000fca18ad8b':
  Don't show fingerprint cancellation messages in keyguard