Fix vulnerability in LockSettings service am: 2d71384a am: 485fbda0 am: 229de708 am: cb83f618 am: e3457fc1 Change-Id: I9ec3cc802112160f463fcfb737c6fd5932d62332