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

Change-Id: Ia8a9962fdbf010066b6fd72ed4ccdc35548571f9