am 991c8c53: Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev

* commit '991c8c53aff32f3d605f6715b3fa78a86990f7ff':
  Enable VoiceInteractionService on watch.