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

Change-Id: Ia75272701a21cae86fa70e06825ee299f690a59e