Merge "Revert "update HotwordDetector exception throws"" into udc-dev