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

* commit 'e6139bf08680120cf1437621f2aadabd82a50197':
  Move public consts to HotwordRecognitionService