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

Change-Id: I655012e04a818f6351c56cebdbafe0a141176f3d