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

Change-Id: Ia8d1dfca9855ef4c34db8de928ff172e1fcbb8eb