am 74f3d396: Merge "Allow different visual and voice assist prompts" into mnc-dev

* commit '74f3d396712a805f5d2c6c1bb769c92b815dec87':
  Allow different visual and voice assist prompts