Merge "Change getVisualVoicemailPackageName() to use subId" am: b00dcbbcda
am: 23b07e4430

Change-Id: I7ed25796b04f05678ac9863e3ba5f5e10844f3cb