Fix vulnerability in LockSettings service
am: 2d71384a13

Change-Id: I62ca5fb150022fe0971329294b1063957f397248