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

* commit '715c502bedee1e414d9d420d35e91a8f2920f25a':
  Allow different visual and voice assist prompts