am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev

* commit '726d47b7716807f740ceea6ea71c46b20ecb8ba7':
  Fix and deprecate lock pattern related settings