Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c
am: 229de7088e

Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1