am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on...
am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit 'd4e00d2b':
Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE