am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev

* commit '5737f7d75c34b2cb7c66771d3cda21a019acd2d2':
  Ensure that the screen on blocker is applied while dozing.