Merge "Change getVisualVoicemailPackageName() to use subId"