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

* commit 'e94a84d2a78edd9f1b92d69aca361bc3affc1cfe':
  Refactor LockSettingsService into storage and logic