am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev

* commit '45fcaa547dc5b9eb2c20879b290415daa1446004':
  Don't wipe device because of short PIN, patterns or passwords