Merge "Potential fix for voicemail icon near dialer but no voicemail." into nyc-dev
am: 1034966af6

* commit '1034966af68c4d3ea1c7c7ab4cedbaeb3bce5894':
  Potential fix for voicemail icon near dialer but no voicemail.