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

* commit '24c02ee4ecee7607ce014022b9a3950350c7cad9':
  Fix voicemail tab showing even after being disabled.