Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c am: 229de7088e
am: cb83f6188b

Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0