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

* commit '1b8df04b8d754f68dc6bfa6caa9e0a2666d16933':
  Allow the keyguard service to be configurable.