Merge changes Ib7a08010,Idd72b82e into sc-qpr1-dev

* changes:
  sensorservice: Track Proximity state change when app goes idle.
  sensorservice: Refactor tracking logic for the Proximity sensor.