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