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

* commit '4371922d13794726d5fb6917b6db07c13e6d7ae2':
  Fix and deprecate lock pattern related settings