Merge changes Ief1cac19,Ibc9236a1 into rvc-dev

* changes:
  Resume-on-Reboot: add storage for armed status
  LockSettingsService: move database storage