am 7515c186: am a5dd432c: am e94a84d2: Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev

* commit '7515c1866772384d3d5f561f6639d8b037998647':
  Refactor LockSettingsService into storage and logic