Merge "DO NOT MERGE Fix wrong voice mail ringtone for secondary SIM." into nyc-mr1-dev am: 02f9837ea7
am: 9f9dea0b43  -s ours

* commit '9f9dea0b435271fe0d931a8ab52888c58c994078':
  DO NOT MERGE Fix wrong voice mail ringtone for secondary SIM.

Change-Id: Ibe829faf89dc105b7db9efbc880a134ff8ae92c0