am 8aeab6c8: Allow the keyguard service to be configurable.

* commit '8aeab6c8b9b89d77108fc05245561e33113fe27f':
  Allow the keyguard service to be configurable.