Merge "Fix wrong voice mail ringtone for secondary SIM."
am: 97b6164710

* commit '97b61647108ffde4cc95e8ab9c92761d944ed68f':
  Fix wrong voice mail ringtone for secondary SIM.

Change-Id: Ic4178ed307eb4e901c4d3b432b40d71a92296356