Merge "Fix VoicemailProviderTest for new columns" into nyc-mr2-dev
am: f097acc609

Change-Id: I76aea40cf9905b3db85a3ae04d671376b9e0c6d0