am 236e174a: am 0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev

* commit '236e174a96e73e5ae189285d984e3091210c762b':
  Add a temporary hack to report screen on while dozing.