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

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

Change-Id: I61cf05766c55cf1724a2fa3655c71a225ff90d15