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

Change-Id: If4ccbb2dc60c969c1a14b93c09c4961d25aa7cf8