am cd655f12: Merge "Fix broken homekey on devices without keyguard" into klp-modular-dev

* commit 'cd655f12e730a76e2a97ce6af775b852adc493ce':
  Fix broken homekey on devices without keyguard