Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c am: 229de7088e am: cb83f6188b am: e3457fc127 am: 669a153531
am: 6314ac7c30

Change-Id: Ic7159f05071eed128971db27f6789e66d8691e20