Merge changes from topic "hotword_qpr" into tm-qpr-dev

* changes:
  Revert "Revert "Refactor ProximityUpdateCallbackInternal to inte..."
  Revert^2 "Add proximity state to the HotwordDetectedResult"