am a5dd432c: am e94a84d2: Merge "Refactor LockSettingsService into storage and...
am a5dd432c: am e94a84d2: Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev
* commit 'a5dd432c':
Refactor LockSettingsService into storage and logic