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

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

Change-Id: I46b376cc2ef995916af7406d046906e0c7981f42