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

Change-Id: I1dadbc10574e60565d0e30d2ba9e26bc352ebf10