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

* commit 'aeda904f55e43b37b0783f4ef2d1a183e3d778db':
  Fix and deprecate lock pattern related settings