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

* commit '5334b265af71a31b0cf428b97b437ac040c067dc':
  Fix and deprecate lock pattern related settings