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

* commit '231bddea314003579718f4214bd0bc535c289b05':
  Don't show fingerprint cancellation messages in keyguard