Merge changes Ia33ab1ab,I1d01ab5d

* changes:
  AOD: Add toggle for waking up instead of ambient display on sensors
  AOD: Refactor DozeMachine to allow waking up