Merge "Fix voicemail tab showing even after being disabled." into nyc-dev am: 24c02ee4ec
am: 3208510696

* commit '32085106969a45718b1b432377bbbbf9a92937f2':
  Fix voicemail tab showing even after being disabled.