am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev

* commit '09395677f7ef5119556e8ba100c0bd27480c9797':
  Decouple turning screen on from waking up in policy.