am 42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev

* commit '42db3761c9ee3df11a367cbc907f2ba433251634':
  DO NOT MERGE Change display state modification during dozing