Fix and deprecate lock pattern related settings

Bug: 22557690
Change-Id: Ib4b3ef7cebe815ba9d9d2284f945a9ec746b216c
4 files changed