am 6f5a94ae: am 3da1ff65: Merge "Disable visual voicemail when corresponding carrier app is installed." into mnc-dev

* commit '6f5a94aea80c4e72052665b6682eef5e2e0ac6a1':
  Disable visual voicemail when corresponding carrier app is installed.