am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev

* commit '8505d4a51d1112ea71f7df680cf85378a9567bde':
  Disable voice input if assist is voice service