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

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