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

Change-Id: I1e95c76f3226598e89ed307c730122227a4a24c1