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

Change-Id: Ie7476d7f2b91e155481c322e7bdc3e60123d89de