Merge "Implement getVisualVoicemailPackageName()" am: 797017f90b am: c45fa03351
am: 47e18eceac  -s ours

Change-Id: I2344f0bc9f3b47eeb20122c4da057d3d94ac463a