am 85e7177a: Merge "Move public consts to HotwordRecognitionService" into klp-dev

* commit '85e7177abe3024218de589a94bc0914bcfe51547':
  Move public consts to HotwordRecognitionService