Merge changes from topic "revert-17936037-hotword_proximity-ZZIDPDULZP"

* changes:
  Revert "Add proximity state to the HotwordDetectedResult"
  Revert "Refactor ProximityUpdateCallbackInternal to interface"