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

* commit '1785c097ccaf9732902c2245fc63c4d044565ffa':
  Don't show fingerprint cancellation messages in keyguard